From 64ef079d7c20c6cca657af52307b6f9d73c9faeb Mon Sep 17 00:00:00 2001 From: "sos22@labyrinth.cl.cam.ac.uk" Date: Mon, 7 Jul 2003 08:50:32 +0000 Subject: [PATCH] bitkeeper revision 1.277 (3f093458V0BnMrGcVZUOCtq7SB5u8w) Oops... we should only add partitions to one disk, not all of them... --- xenolinux-2.4.21-sparse/fs/partitions/xeno.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xenolinux-2.4.21-sparse/fs/partitions/xeno.c b/xenolinux-2.4.21-sparse/fs/partitions/xeno.c index 871e20fef9..2d8f3b9543 100644 --- a/xenolinux-2.4.21-sparse/fs/partitions/xeno.c +++ b/xenolinux-2.4.21-sparse/fs/partitions/xeno.c @@ -42,6 +42,11 @@ int xeno_partition(struct gendisk *hd, for (i = 0; i < buf->n_aces; i++) { if ((buf->entries[i].device & 0x1f) == 0) continue; + /* Make sure the partition is actually supposed to be on this + disk. This assumes that Xen and XenoLinux block device + numbers match up. */ + if ((buf->entries[i].device & ~0x1f) != bdev->bd_dev) + continue; /* This is a bit of a hack - the partition numbers are specified by the hypervisor, and if we want them to match up, this is what we need to do. */ @@ -52,5 +57,6 @@ int xeno_partition(struct gendisk *hd, buf->entries[i].n_sectors); } kfree(buf); + printk("\n"); return 1; } -- 2.30.2